Commonize selection for waypt and trk/rte processing.

diff --git a/gpsbabel/discard.c b/gpsbabel/discard.c
index 7ecca81528eb8c203180452035376d205a8a39c0..8e7936e18a0d6f8237f1df9795bdb10fe8ba1bc5 100644 (file)
--- a/gpsbabel/discard.c
+++ b/gpsbabel/discard.c
@@ -21,8 +21,6 @@
 #include <stdio.h>
 #include "defs.h"
 
-extern queue waypt_head;
-
 static char *hdopopt = NULL;
 static char *vdopopt = NULL;
 static char *andopt = NULL;
@@ -40,6 +38,33 @@ arglist_t fix_args[] = {
        {0, 0, 0, 0, 0}
 };
 
+/*
+ * Decide whether to keep or toss this point.
+ */
+static void
+fix_process_wpt(const waypoint *wpt)
+{
+       int del = 0;
+       int delh = 0;
+       int delv = 0;
+       waypoint *waypointp = (waypoint *) wpt;
+
+       if ((hdopf >= 0.0) && (waypointp->hdop > hdopf))
+               delh = 1;
+       if ((vdopf >= 0.0) && (waypointp->vdop > vdopf))
+               delv = 1;
+       
+       if (andopt)
+               del = delh && delv;
+       else
+               del = delh || delv;
+
+       if (del) {
+               waypt_del(waypointp);
+               waypt_free(waypointp);
+       }
+}
+
 static void
 fix_process_track(const route_head *trk)
 {
@@ -47,65 +72,18 @@ fix_process_track(const route_head *trk)
        queue *elem, *tmp;
        
        QUEUE_FOR_EACH((queue *)&trk->waypoint_list, elem, tmp) {
-               
-               int del = 0;
-               int delh = 0;
-               int delv = 0;
-
                waypointp = (waypoint *)elem;
-               
-               if ((hdopf >= 0.0) && (waypointp->hdop > hdopf))
-                       delh = 1;
-               if ((vdopf >= 0.0) && (waypointp->vdop > vdopf))
-                       delv = 1;
-               
-               if (andopt)
-                       del = delh && delv;
-               else
-                       del = delh || delv;
-
-               if (del) {
-                       waypt_del(waypointp);
-                       waypt_free(waypointp);
-               }
 
+               fix_process_wpt(waypointp);
        }
 }
 
-void
+static void
 fix_process(void)
 {
-       waypoint * waypointp;
-       queue *elem, *tmp;
-       extern queue waypt_head;
-       
-       // Filter waypoints
+       // Filter waypoints.
+       waypt_disp_all(fix_process_wpt);
 
-       QUEUE_FOR_EACH(&waypt_head, elem, tmp) {
-               
-               int del = 0;
-               int delh = 0;
-               int delv = 0;
-
-               waypointp = (waypoint *)elem;
-               
-               if ((hdopf >= 0.0) && (waypointp->hdop > hdopf))
-                       delh = 1;
-               if ((vdopf >= 0.0) && (waypointp->vdop > vdopf))
-                       delv = 1;
-               
-               if (andopt)
-                       del = delh && delv;
-               else
-                       del = delh || delv;
-
-               if (del) {
-                       waypt_del(waypointp);
-                       waypt_free(waypointp);
-               }
-
-       }
-       
        // Filter tracks
        track_disp_all(fix_process_track, NULL, NULL);
        
@@ -114,28 +92,24 @@ fix_process(void)
        
 }
 
-void
+static void
 fix_init(const char *args) 
 {
        if (hdopopt)
                hdopf = atof(hdopopt);
        else
                hdopf = -1.0;
+
        if (vdopopt)
                vdopf = atof(vdopopt);
        else
                vdopf = -1.0;
 }
 
-void
-fix_deinit(void) 
-{
-}
-
 filter_vecs_t discard_vecs = {
        fix_init,
        fix_process,
-       fix_deinit,
+       NULL,
        NULL,
        fix_args
 };